From 3a121df267ce86ac140bd9823877c513b2e2e20d Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Mon, 13 Dec 2010 09:26:01 -0800
Subject: [PATCH] ChangeLog merge fix.

---
 etc/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/etc/ChangeLog b/etc/ChangeLog
index cf17b8219b6..bc2a0755678 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -2,7 +2,6 @@
 
 	* schema/schemas.xml: Add DocBook (Bug#7491).
 
-2010-12-13  Ulrich Mueller  <ulm@gentoo.org>
 2010-12-11  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* refcards/orgcard.tex: Cleanup.
-- 
2.30.2